From df4685e4eac7bb99681fb3dd49345bb802178d39 Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Thu, 25 Nov 2004 21:06:13 +0000 Subject: [PATCH] bitkeeper revision 1.1159.187.18 (41a64945RGajx3hjodoeMCbM8Ky3ZA) Cleanups. --- .../drivers/xen/blkfront/blkfront.c | 34 +++++-------------- .../drivers/xen/console/console.c | 11 ++++-- xen/arch/x86/domain.c | 2 -- 3 files changed, 16 insertions(+), 31 deletions(-) diff --git a/linux-2.6.9-xen-sparse/drivers/xen/blkfront/blkfront.c b/linux-2.6.9-xen-sparse/drivers/xen/blkfront/blkfront.c index 3384099641..6802802918 100644 --- a/linux-2.6.9-xen-sparse/drivers/xen/blkfront/blkfront.c +++ b/linux-2.6.9-xen-sparse/drivers/xen/blkfront/blkfront.c @@ -73,12 +73,6 @@ static char * blkif_status_name[] = { [BLKIF_INTERFACE_STATUS_CHANGED] = "changed", }; -#if 1 -#define dprintf(fmt, args...) \ -printk(KERN_ALERT "[XEN:%s:%s:%d] " fmt, \ -__FUNCTION__, __FILE__, __LINE__, ##args) -#endif - #define WPRINTK(fmt, args...) printk(KERN_WARNING "xen_blk: " fmt, ##args) static int blkif_handle = 0; @@ -189,10 +183,8 @@ static inline void flush_requests(void) __initcall(xlblk_init); #if ENABLE_VBD_UPDATE -static void vbd_update() +static void vbd_update(void) { - dprintf(">\n"); - dprintf("<\n"); } #endif /* ENABLE_VBD_UPDATE */ @@ -412,7 +404,7 @@ void do_blkif_request(request_queue_t *rq) blk_stop_queue(rq); break; } - DPRINTK("do_blkif_request %p: cmd %p, sec %lx, (%u/%li) buffer:%p [%s]\n", + DPRINTK("do_blk_req %p: cmd %p, sec %lx, (%u/%li) buffer:%p [%s]\n", req, req->cmd, req->sector, req->current_nr_sectors, req->nr_sectors, req->buffer, rq_data_dir(req) ? "write" : "read"); @@ -528,10 +520,8 @@ static void update_vbds_task(void *unused) static void vbd_update(void) { static struct tq_struct update_tq; - dprintf(">\n"); update_tq.routine = update_vbds_task; schedule_task(&update_tq); - dprintf("<\n"); } #endif /* ENABLE_VBD_UPDATE */ @@ -775,8 +765,6 @@ int blkif_revalidate(kdev_t dev) } - - /* * blkif_queue_request * @@ -896,8 +884,6 @@ static int blkif_queue_request(unsigned long id, /* Keep a private copy so we can reissue requests when recovering. */ translate_req_to_pfn(&rec_ring[xid], req ); - - return 0; } @@ -1125,8 +1111,6 @@ static void blkif_send_interface_connect(void) static void blkif_free(void) { - printk(KERN_INFO "xen_blk: Recovering virtual block device driver\n"); - /* Prevent new requests being issued until we fix things up. */ spin_lock_irq(&blkif_io_lock); recovery = 1; @@ -1153,7 +1137,8 @@ static void blkif_close(void) /* Move from CLOSED to DISCONNECTED state. */ static void blkif_disconnect(void) { - if(blk_ring) free_page((unsigned long)blk_ring); + if ( blk_ring != NULL ) + free_page((unsigned long)blk_ring); blk_ring = (blkif_ring_t *)__get_free_page(GFP_KERNEL); blk_ring->req_prod = blk_ring->resp_prod = resp_cons = req_prod = 0; blkif_state = BLKIF_STATE_DISCONNECTED; @@ -1162,7 +1147,6 @@ static void blkif_disconnect(void) static void blkif_reset(void) { - printk(KERN_INFO "xen_blk: Recovering virtual block device driver\n"); blkif_free(); blkif_disconnect(); } @@ -1185,8 +1169,6 @@ static void blkif_recover(void) } } - printk(KERN_ALERT"blkfront: recovered %d descriptors\n",req_prod); - /* Stage 2 : Set up shadow list. */ for ( i = 0; i < req_prod; i++ ) { @@ -1253,9 +1235,9 @@ static void blkif_connect(blkif_fe_interface_status_t *status) static void unexpected(blkif_fe_interface_status_t *status) { - WPRINTK(" Unexpected blkif status %s in state %s\n", - blkif_status_name[status->status], - blkif_state_name[blkif_state]); + DPRINTK(" Unexpected blkif status %s in state %s\n", + blkif_status_name[status->status], + blkif_state_name[blkif_state]); } static void blkif_status(blkif_fe_interface_status_t *status) @@ -1290,7 +1272,7 @@ static void blkif_status(blkif_fe_interface_status_t *status) break; case BLKIF_STATE_DISCONNECTED: case BLKIF_STATE_CONNECTED: - unexpected(status); + /* unexpected(status); */ /* occurs during suspend/resume */ blkif_reset(); break; } diff --git a/linux-2.6.9-xen-sparse/drivers/xen/console/console.c b/linux-2.6.9-xen-sparse/drivers/xen/console/console.c index b293961363..43f4905575 100644 --- a/linux-2.6.9-xen-sparse/drivers/xen/console/console.c +++ b/linux-2.6.9-xen-sparse/drivers/xen/console/console.c @@ -658,6 +658,8 @@ const struct consw xennull_con = { static int __init xencons_init(void) { + int rc; + if ( xc_mode == XC_OFF ) return 0; @@ -713,9 +715,12 @@ static int __init xencons_init(void) xencons_driver.wait_until_sent = xencons_wait_until_sent; #endif - if ( tty_register_driver(DRV(xencons_driver)) ) - panic("Couldn't register Xen virtual console driver as %s\n", - DRV(xencons_driver)->name); + if ( (rc = tty_register_driver(DRV(xencons_driver))) != 0 ) + { + printk("Couldn't register Xen virtual console driver as %s\n", + DRV(xencons_driver)->name); + return rc; + } #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0) tty_register_device(xencons_driver, 0, NULL); diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 47187ac118..4a01d86351 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -524,8 +524,6 @@ static void relinquish_list(struct domain *d, struct list_head *list) void domain_relinquish_memory(struct domain *d) { - audit_domain(d); - /* Ensure that noone is running over the dead domain's page tables. */ synchronise_pagetables(~0UL); -- 2.30.2